From c15fc6099ef5b5731e1a66205ba4f1542e81ee04 Mon Sep 17 00:00:00 2001 From: "smh22@tempest.cl.cam.ac.uk" Date: Wed, 28 Jul 2004 15:35:54 +0000 Subject: [PATCH] bitkeeper revision 1.1108.1.35 (4107c7da9kAXLjKhklba_j2Kjf05bg) don't use common slab/page allocators for ia64 (it uses 2.6 stuff in arch directory) --- BitKeeper/etc/ignore | 1 + xen/common/Makefile | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 1d33ae4009..aa55ed6b09 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -54,3 +54,4 @@ xen/tools/figlet/figlet xen/xen xen/xen-syms xen/xen.* +xen/common/sched_atropos.c.smh diff --git a/xen/common/Makefile b/xen/common/Makefile index 8304180198..84e3a1292f 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,6 +1,11 @@ include $(BASEDIR)/Rules.mk +ifeq ($(TARGET_ARCH),ia64) +OBJS := $(subst page_alloc.o,,$(OBJS)) +OBJS := $(subst slab.o,,$(OBJS)) +endif + ifneq ($(debugger),y) OBJS := $(subst debug.o,,$(OBJS)) OBJS := $(subst debug-linux.o,,$(OBJS)) -- 2.30.2